Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 03:34:13 +0000 (20:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 03:34:13 +0000 (20:34 -0700)
commit1138967d54b10ef3e45112449ec052ae000cc4ac
tree6503b4321cfd9ed90108c133aea8239321ef1416
parent55b825f2efbe3ce34929a265f67641cdc0649fc6
parente1f4cd1cff2f698d9fd527a8ee77a7a1a951c8d6
Merge from trunk.